Performance + UI improvents