Some UI JS and post logic fixes