Improving uberfire-demo