Adding markers and some ui logic