Added new categories and floors

#fixes 2
#fixes 5