Fixing up remaining layouts and bugs for the final commit.