Minor changes for better view