Change HTML to be div based rather than table

Added back the priority style controls as wel