fixed imports
reworked login a bit