Layout and build improvements; this definitely starts to look like first final version.