new functionality and layout