Improving layout
Configuring FeatureContext