tweak wordings
tweak layout
Add loading
Layout tweaks