UI and code structure refreshed.