Improve layouts and markers