GUI clean up.. main layout, login layout cleaned..