js fix and design fix