V2.1 of log in screen, added labels.
fixed conflict