Buttons and frames fixed