UX Improvements guided by Danilo Pinheiro, also updated the address