Sravanthi, Shruthi | #837 | Moving button select to a separate file