Fixed app folder structure/ Replaced back icon with font