added refresh button, rearranged structure