Cleaned up home screen and service screen.