create UI for loggedin page
Fix merge conflict