fixed menu popup and other tediousies