Bug fixes and refresh button added.
bug fixes and refresh button