More UI updates and more buttons