UI Prep for future updates