Add small modifications
Replaced Grid with Flow
Add enums for future features