major style update and update from original site