Minor layout tweaks. Legos, I guess. Resolves #3