Improved design and fixed some tiny typos in the view