Cleaner implementation of last fixes and also now refresh button status so the newly randomised item button gets ticked correctly.