Some Tweaks

Added popovers and forms