Removed select button
Started working on issue #2