Added edit view and button colors