Added nested tags for startup model
Lazy commit - Updated front-end flow