Tommy's latest UI changes