Separated View mode and normal mode buttons

Close #37