Renamed modal to loginModal where appropriate