ESP static and dynamic labels added and working correctly. Small tweaks and cleanup