Bug fixes and warning fixes, plus CSS/JS change