changed ui
fixed bugs