changed layout of addAddress and fixing some issues in this layout