Add proper formatting

Add some formatting for some items.