changed ui and minor fixes