some style chagnes
MERGE fixed confliccts
adding css and page copy