Cleaned code, Added Category DropDown

No more silly dirty code and a new dropdown to choose a category.