improve state handling, fix width issues, cleanup ui
add scales