Cleanup various things, fix login page
merge