Fixed name positioning issues
Fixed name positioning issues (tm)