Changed layouts and button designs