Merge minor changes from dev to master

Minor visual changes.