drastic UI cleanup