Merging UX with Master

Many small styling changes.