Views update and user borrow fix
Minor main view design changes