Breaking up a few things into files
Adapted the icons for better visibility of selected and unselected state.