UI is coming in, need to work on categories
Include data properly