Fix layout. Refactor some css styles