finished creating and fixing layout
merge
merge