MAssive UI cleanup