Add categories & layout fixes