added more iPad support and fixed categories