Updated view and some icons