Changed spacing in files, moved display messages to partial