code cleanup
wip, ui fixes
done with timer