reworked js & css