Style fixes on stage and JS warnings