Got more of the UI updated, messages and more