Changed layout and revised marker logic