Minor changes to improve the view