Some merge bugs fixed

- a layout file I was working on wasn’t committed
- subreddit list back button handled correctly