Feature/pretty pictures