MInor changes in the UI and formatting