Updated some functions & the design of some views