Workable layout, for now, and all around fixes.