further changes in basic layout
merge from origin