Finished up category views and fixed some bugs.