Add user login popups, fix javascript includes