Bug, Warning fix + Login UI cosmetic changes