Fixed some CSS issues, added js