Improve selector order
Improve comments
Reorganize and restyle template