Removed comments and rejigger navigation