Changed model to use relationships
Fixed a weird bug and fixed comments layout