Fixed layout issues and renamed add_update friend file layout