Added navigation to log-in pages
Taking out fto login from signup

This partially reverts commit d550072a1f5805ffdfeebc3fc3ed21aec574db58.
Merge branch 'collab/z-hart' into dev