added categories from GPXViewer, replaced %< with <, added needed @imports