2nd Version

Different UI from 1st Version, some JS errors fixed