Categories section added and other improvements