diff --git a/app/controllers/fotos_controller.rb b/app/controllers/fotos_controller.rb
index d55f135..17dfa4c 100644
--- a/app/controllers/fotos_controller.rb
+++ b/app/controllers/fotos_controller.rb
@@ -20,9 +20,9 @@ class FotosController < ApplicationController
     @openfotoid=@foto.id
     @pppage=params[:pppage].to_i % 4
     @pppage_array = [ 25 , 50 , 100, 10000]
-   @page = params[:page].nil? ? 1 : params[:page].to_i
- 
-     @fotos_p = @gallery.fotos.page(@page).per(@pppage_array[@pppage])
+    @page = params[:page].nil? ? 1 : params[:page].to_i
+    
+    @fotos_p = @gallery.fotos.page(@page).per(@pppage_array[@pppage])
     @fotos_n = @gallery.fotos- @fotos_p
     respond_to do |format|
       format.html {
diff --git a/app/controllers/galleries_controller.rb b/app/controllers/galleries_controller.rb
index 3e40570..fe79760 100644
--- a/app/controllers/galleries_controller.rb
+++ b/app/controllers/galleries_controller.rb
@@ -19,7 +19,7 @@ class GalleriesController < ApplicationController
   def show
     @gallery = Gallery.find(params[:id])
     
-    @pppage_array = [ 25 , 50 , 100, "all"] #defines number & size of picture chunks
+    @pppage_array = [ 25 , 50 , 100, 10000] #defines number & size of picture chunks
     @pppage = 0 #starting index of pppage_array
     
     if !params[:pppage].nil? && params[:pppage].to_i <= 3 && params[:pppage].to_i >= 0
diff --git a/app/views/galleries/show.html.erb b/app/views/galleries/show.html.erb
index b5fe40f..7362515 100644
--- a/app/views/galleries/show.html.erb
+++ b/app/views/galleries/show.html.erb
@@ -63,7 +63,8 @@ end
 </style>
 <div class="fluid-row">
   <div class="span9">  <!-- pagination-->
-    <div class="pagination pull_left" style="margin:0px 0px 0px 0px">
+    <%= paginate @fotos_p , theme:'twitter-bootstrap' %>
+<!--    <div class="pagination pull_left" style="margin:0px 0px 0px 0px">
       <ul>
 	<li><a href="<%= gallery_path @gallery, {:pppage => @pppage, :page => (@page==1 ? @page : @page-1)} %>"><%=I18n.t('fotos.prev')%></a></li>
 	<% # for i in 1..@pages do 
@@ -72,7 +73,7 @@ end
 	<% # end %>
 	<li><a href="<%= gallery_path @gallery, {:pppage => @pppage, :page => (@page==@pages ? @page : @page+1)} %>"><%=I18n.t('fotos.next')%></a></li>
       </ul>
-    </div>
+    </div>-->
   </div>
   <div class="span3"> <!-- size selector -->
     <div class="pull-right">
@@ -168,7 +169,7 @@ end
   <% end %>
   <%= render 'layouts/pretty_toolbar' %>
 </div>
-<%= @pppage_array[@pppage] %>
+
 <%= javascript_include_tag "blueimp-gallery-all" %>
 
 <script>