More sane layout