Changed the save,reset buttons positions and fixed makeup controller