More fixes

Updated UI, wired some buttons, other sruff.