Added back stack navigation, slightly better comment styles