Moar fixes, moar UI cleanup