back button, minor changes to layout and small stuff