Minor refactoring
Move update logic into model where it belongs
Remove some unused CSS