Fixes for production JavaScript
Bug fixes and some styles