Added categories, improved age selection loop