More UI changes again, fixed a bug