Better Looking Demo but still got some issues