[New] Added categories functionality and various design changes