Updated look and feel for new colors, and cleaned up some layout issues.