added configuration and layout changes