Working on JS and CSS improvements