Minor semantic and layout improvements