Various changes, made formatting a little bit nicer, one less page load for logging in etc...