Several small updates around look and feel