Update, small tweaks and login functionality