Several fixes and ui tweaks

DB will have to be wiped