Improve entity scaling and fix bar