make login section semantic
clean that up some more
get ridd of trailing spaces
delete text before inputs
style form
solve merge conflicts