Cleaned up section selection code in wallet
Popup working again
Moved new wallet form into wallet