Second commit to fix a few layout issues