Make widget markup consistent and add widget styles