Issue #15, color scheme edits

Minor design tweaks as well.