Some changes in views to make it all look better.