Logic improved for Service Tab. Ready for testing.