Fifth commit: Operation picker added and Misc. Changes