Cleaned up slider a bit
More Cleanup
Renamed watches to be multi-platform compatible