AF and WC views simplified, page up moved to navbar