Added selector and refresh screen