Added all new variables + UI changes