Another bunch of modifications on our way to new design.