Few changes still bugs

Made a few changes to prevent doubling up on M2 items. Still need to
work on the logic of the back button and select button.