Buttons now display correctly in all situations for both admin and non-admin accounts.