Cleaned up code
Fixed backstack bugs, cleaned up menu items