UI Change to login, register, edit + minor chnages