Added DialogFragment Wrapper and minor fixies.