Categories setting

+cleaning up