some light refactoring
adds categories and basic layout elements