Add layout and remove scaffold css