changes due to issue #8 and #6 and begin to restyle for the new logo