Added new back button with support for new option button