Fixing bugs and look and feel
Adding Categorization