Made some style changes and fixed javascript issue