refactor layout a bit more