Further changed layout