fixing map
removed unecessary files
layout update