Fixed saving and viewing