Combining the two versions into one

Added a mode button to switch between the different mode
Added a label to see which mode is currently being used