trying to clean up some ui stuff..