Updated layout & removed JQueryUI