Moved width and height on main class