CSS-addition: initial commit
Updated JSON flows
refactoring and improving existing code