Cosmetic changes to make the view better