fixing layouts conflicts and double js files inclusion