new:nag and progress_bar
Merge branch 'feature/layout_v1' into development