Merge "Refactored code so fab side button scaling makes more sense." into ub-deskclock-fantasy