moved config arround and layout changes