Still tweaking layout.
New build with layout tweaks.