back button debug and some layout adjustments