General layout and style improvements