Minor changes for a better view