Started to implement the styling from Adrian
Further styling including some hacks for the demo
Further styling