Fixed some CSS & JavaScript issues