Fix #4

Schema fixes.
View fixes.
Controller fixes.