added css and js for linking
merged
minor tweaks
first look
merge w/ master