Adding picture support and more styling