fixes into project template layout
stylesheet conflicts merged