layout details

enhance login page, and fix layout bugs and conflict