Change drawing functions to be consistant
Added JQueryUI