moved around some buttons