Add login box
Merge ui in master