change layout to box layout
optimize box layout model
Merge branch 'feature/rework-layout' into develop