Map split off into another screen; some UI tidying

Beginnings of live recording screen in there now; reworking of the
analysis screen