Rename marker methods and format html better