Changes to design to make it more consistent with all devices