fix active state borders and clean up
add money mode switch to view controls