Added settings view
Added settings view and history view