JS & CSS improvements