Fixed small js bug and tweked the design