Update UI to look a bit more streamlined