Initial Commit for Latest Layout fixes

This commit includes the updated (but untested) layout code.  Marek will
take the code update in this commit and ensure it is wired properly to
run on the desktop app.