Removed subject text; Added buttons and layout