UI fixes, new buttons etc