Added category, completed FE!!