Cleaned up and moved refresh to bottom