finished fixing layout