UI fix after packages introduced