UI and level bugfix