Added category table, fixed layout issue