Design update and polish