fixed some ui changes & functionality