Corrected some UI errors. More changes to come
Some UI changes