changed master blade to work with new layout + css