ugly but working

Modern and Weather Watch have been merged and are functional, if hideous.