Added categories
Improved hidden image handling