unify square and round watch layout