just moved some buttons