Added category support and some styling