Big layout changes.

@marcinkiewiczblazej review and rebase plox