Layoutoverride

Made some minor adjustments to better prepare it for interface with the values that will be passed in. Also cleaned up a little.