Application component logic improvement
Some styling for demo application