Formatting: Cleaned-up the view formatting