Moved buttons to be accessible on me11 and non me11