Updated style, fixed Javascript