added UI and address storage