Adding width and height options
Clean up HTML