Few styling and JS Updates