fixed buttons and added options button