Styling and Layout changes by Geoff