Moved service-monitor resource out of resource folder to reduce un-needed typing
Improved service-monitor template formatting
Minor improvements