Fix popup menu madness and added fields