closes #19 - cleaned up the models and views

Signed-off-by: Alexander Skjolden <alex@plastboks.net>