removing ds_store
fixing default navbar
merging