Refactor bring selected to front