Major Renovations

Fixed primary key to id, rather than the accidental setting to name.
Formatted views to be more appropriate.