re-hashed design, code cleanup

gave it a new look and feel and worked in some less cumbersome markup.