Refactored into templates. CSS not yet fixed
Reverted changes to watch