     @album = el.closest("tr").data 'album'
     @showManager 'album'
   
-  '#albumList .images .img click': (el) ->
-    imageId = el.data 'id'
+  '#albumList .images .img img click': (el) ->
+    imageId = el.parent().data 'id'
     album = el.closest("tr").data 'album'
     @showAlbumSlides imageId,album
-  
-    
+    
+  '#albumList .images .add click': (el) ->
+    @addImageToDropbox el.parent()
+        
   #- Slideshow -#
 
-  '.prev click': ->
+  '.footer .prev click': ->
     currentIndex = $("#slideshow img:visible").index()
     @showSlide currentIndex-1  
 
-  '.next click': ->
+  '.footer .next click': ->
     currentIndex = $("#slideshow img:visible").index()
     @showSlide currentIndex+1
 
-  '.add click': (el) ->
+  '.footer .add click': (el) ->
     imageElement = $("#slideshow img:visible")
     imageId = imageElement.data('id')
-    imageMeta = $("#slideshow img:visible").data('image')
+    imageMeta = imageElement.data('image') #todo: refactor?
     @imageCookie.add imageId
     @showImageInDropbox imageId,imageMeta
     el.hide()
     
-  '.footer .info click': ->
-    $("#tagging").hide()
-    if $("#tagging").is(":visible")
-      $("#info").hide()
-    else
-      @showInfo $("#slideshow img:visible:first").data 'image'
-      $("#tagging").hide()
-      $("#info").show()
-
-      
   showInfo: (meta) ->
     $("#info .name span").text meta.title
     $("#info .author span").text meta.artist
     $("#info .year span").text meta.year
   
-  '.footer .tag click':  ->
-    $("#info").hide()
-    if $("#info").is(":visible")
-      $("#tagging").hide()
+  showTags: (meta) ->
+    #todo
+    
+  showInfoTag: (type) ->
+    $("#infoTags").show() if not $("#infoTags").is(':visible')
+    target = $("##{type}")
+    if target.is(":visible") 
+      target.hide() 
     else
-      $("#info").hide()
-      $("#tagging").show()
-  
+      meta = $("#slideshow img:visible:first").data 'image'
+      @showTags meta if type = 'tagging'
+      @showInfo meta if type = 'info'
+      target.show()  
+    
+  '.footer .info click': ->
+    @showInfoTag 'info'
+  
+  '.footer .tag click': ->
+    @showInfoTag 'tagging'
+
     
   showAlbumSlides: (imageId, album) ->
     imageIds = []

        $("#dropbox .active").show()
      stop: ->
        $("#dropbox .active").hide()
    }   
      
  
  ## GENERAL DISPLAY

    @showSingleSlide imageId
    
  showAlbumList: ->
    @showSpinner()
    $.get "/albums?artist=#{@artist}&section=#{@section}&category=#{@category}",(html) =>
      @displayScreen "albumList",html
      @setDraggable $("#albumList .images .img")
      @hideSpinner()
      
  
  #- Album List -#
  
