Add refresh menu item. Rename some clases for better undestand