Added login, rework other features