UI tweaks and removed dummy GDP