Got basic popup menu working. Cleaned a bit.