#7 small layout for application. And few configuration for #30 and #31