Categories controller + some fixes