UI fixes for gtk #2