Fixing some spacing and fixing LoginForm dependencies