diff --git a/filter/flickr_filter.module b/filter/flickr_filter.module
index ece5082..1663042 100644
--- a/filter/flickr_filter.module
+++ b/filter/flickr_filter.module
@@ -8,7 +8,7 @@ require_once(drupal_get_path('module', 'flickr') . '/flickr.inc');
 function flickr_filter_info() {
   $filters['filter_flickr'] = array(
     'title' =>  t('Flickr linker'),
-    'description' => t('Allows you to Insert Flickr images: [flickr-photo:id=230452326,size=s] or [flickr-photoset:id=72157594262419167,size=m]'),
+    'description' => t('Allows you to Insert Flickr images: [flickr-photo:id=230452326,size=s] or [flickr-photoset:id=72157594262419167,size=m].<br/>Single images will float alternately right and left.'),
     'process callback' => '_filter_flickr',
     'tips callback' => '_filter_flickr_tips',
   );
@@ -71,10 +71,13 @@ function flickr_filter_split_config($string) {
  * Filter callback for a photo.
  */
 function flickr_filter_callback_photo($matches) {
+  static $count = 0;
+  $zebra = ($count % 2) ? 'even' : 'odd';
+  $count++;
   list($config, $attribs) = flickr_filter_split_config($matches[1]);
   if (isset($config['id'])) {
     if ($photo = flickr_photo_get_info($config['id'])) {
-      return theme('flickr_filter_photo', array('photo' => $photo, 'size' => $config['size'], 'attribs' => $attribs));
+      return '<div class="flickr-' . $zebra . '">' . theme('flickr_filter_photo', array('photo' => $photo, 'size' => $config['size'], 'attribs' => $attribs)) . '</div>';
     }
   }
   return '';
diff --git a/flickr.css b/flickr.css
index 38de737..e50b00f 100644
--- a/flickr.css
+++ b/flickr.css
@@ -1,4 +1,3 @@
-
 .flickr-photos {}
 
 .flickr-photo {}
@@ -15,8 +14,6 @@
   height: 260px;
 }
 
-
-
 .flickr-photosets {}
 
 .flickr-photoset {}
@@ -36,3 +33,24 @@
 .flickr-photoset-title {}
 
 .flickr-photoset-count {}
+
+div.flickr-single, div.flickr-wrap {
+  display: inline-block;
+}
+
+.flickr-credit {
+  font-size: 80%;
+}
+
+/**
+ * Float single Flickr images found in the body text alternately right and left.
+ */
+.content div.flickr-odd {
+  float: right;
+  margin: 5px 0 5px 10px;
+}
+.content div.flickr-even {
+  float: left;
+  margin: 5px 10px 5px 0;
+}
+
diff --git a/flickr.info b/flickr.info
index f5edfe3..9dd8383 100644
--- a/flickr.info
+++ b/flickr.info
@@ -4,6 +4,7 @@
 core = 7.x
 
 files[] = flickr.module
+stylesheets[all][] = flickr.css
 ; Information added by drupal.org packaging script on 2012-02-10
 version = "7.x-1.x-dev"
 core = "7.x"
diff --git a/flickr.module b/flickr.module
index d480fe9..e8f2c68 100644
--- a/flickr.module
+++ b/flickr.module
@@ -124,7 +124,6 @@ function flickr_photos_access($account) {
 }
 
 function flickr_photos($user = NULL) {
-  drupal_add_css(drupal_get_path('module', 'flickr') . '/flickr.css');
 
   global $pager_page_array, $pager_total, $pager_total_items;
   //set this to something else if you want multiple pagers
@@ -260,11 +259,12 @@ function theme_flickr_photo($variables) {
   $size = $variables['size'];
   $format = $variables['format'];
   $attribs = $variables['attribs'];
+  $url = flickr_photo_img($photo, 'z', $format); //For quicker loading of images in colorbox remove the z, using 500px instead of 620px.
   
   $img = flickr_img($photo, $size, $attribs);
   $photo_url = flickr_photo_page_url($photo['owner'], $photo['id']);
   $title = is_array($photo['title']) ? $photo['title']['_content'] : $photo['title'];
-  return l($img, $photo_url, array('attributes' => array('title' => $title), 'absolute' => TRUE, 'html' => TRUE));
+  return '<div class="flickr-wrap">' . l($img, $url, array('attributes' => array('title' => $title, 'class' => array('colorbox'), 'rel' => 'gallery-node'), 'absolute' => TRUE, 'html' => TRUE)). '<div class="flickr-credit">' . l('Flickr', $photo_url, array('attributes' => array('title' => t('View on Flickr. To enlarge click pic.'), 'target' => '_blank'))) . '</div></div>'; //Final step that generates the image with a link to the bigger version and a link to the Flickr page under it to comply with the TOS of Flickr.
 }
 
 function theme_flickr_photo_box($variables) {