Reworked and fixed auth. Prettied up some layouts