Little more view screen work, Username/password added to model