General layout changes and unicorn config