fixed css extending and small style changes