Added save button and changed displaying options