EDT-628 Streamlined Table UX