Support iDevice clicks, modified category names a bit