testing out the branch, updated Ui a bit
Added map toggle amongst various other improvements