Added dropdown macro, fixed Cat/Entry adds