stuff
UI tweaks
attempted login fix
merging april