Adding back stack fixes and cleaning up some UI elements.