ui adjustments and getting rid of some comments/leftovert rials