Removed subject text; Added buttons and layout
Merge remote-tracking branch 'origin/master' into work