styling update
.js update

Syncing up with Joe's stuff
Merge pull request #9 from yuanphoon/styling-branch

Styling branch