Updated layouts, server and removed ds_store files