Modified user interface layout
Modified user interface and layout