Adding more functionality

Adding more functionality:
> better popup alert
> login bug fix