Some css changes and margins