JS design fixes