1. Fixed
2. Added refresh button