Added before and after to select and input