Adding some minor fixes and improving areas/services' show