Reorganise main fragment, change sensor type to step counter