Removed fullscreen and inbox buttons

Merge Commit