Change up the UI, fix bug with adding addresses