Fixed move of layout, should be moved to config