Removed extra CSS folder and corrected poor merging in _layout.jsp.