Updated view and added CSS