Category Adding Supported + Several UI tweaks