diff --git a/httpdocs/theme/react/app-opendesktop-home/app.js b/httpdocs/theme/react/app-opendesktop-home/app.js
index 13534f1b0..ee2881921 100644
--- a/httpdocs/theme/react/app-opendesktop-home/app.js
+++ b/httpdocs/theme/react/app-opendesktop-home/app.js
@@ -1,247 +1,246 @@
 class App extends React.Component {
   constructor(props){
   	super(props);
   	this.state = {
       loading:true
     };
     this.initHomePage = this.initHomePage.bind(this);
     this.updateDimensions = this.updateDimensions.bind(this);
     this.convertDataObject = this.convertDataObject.bind(this);
   }
 
 
   componentWillMount() {
     this.updateDimensions();
   }
 
   componentWillUnmount(){
     window.removeEventListener("resize", this.updateDimensions);
     window.removeEventListener("orientationchange",this.updateDimensions);
   }
 
   componentDidMount() {
     this.initHomePage();
   }
 
   initHomePage(){
     window.addEventListener("resize", this.updateDimensions);
     window.addEventListener("orientationchange",this.updateDimensions);
 
     let env = "live";
     if (location.hostname.endsWith('cc')) {
       env = "test";
     } else if (location.hostname.endsWith('localhost')) {
       env = "test";
     }
     this.setState({env:env},function(){
       this.convertDataObject();
     });
   }
 
   updateDimensions(){
     const width = window.innerWidth;
     let device;
     if (width >= 910){
       device = "large";
     } else if (width < 910 && width >= 610){
       device = "mid";
     } else if (width < 610){
       device = "tablet";
     }
     this.setState({device:device});
   }
 
   convertDataObject() {
     let productGroupsArray = [];
     for (var i in window.data) {
       if (i !== "comments"){
         const productGroup = {
           title:i,
           products:JSON.parse(window.data[i])
         }
         productGroupsArray.push(productGroup);
       }
     }
     this.setState({productGroupsArray:productGroupsArray,loading:false});
   }
 
   render(){
     let productCarouselsContainer;
     if (this.state.loading === false){
       productCarouselsContainer = this.state.productGroupsArray.map((pgc,index) => (
         <div key={index} className="section">
           <div className="container">
             <ProductCarousel
               products={pgc.products}
               device={this.state.device}
               title={pgc.title}
               link={'/'}
               env={this.state.env}
             />
           </div>
         </div>
       ));
     }
 
     return (
       <main id="opendesktop-homepage">
         <div id="featured-product">
           <div className="container"></div>
         </div>
         {productCarouselsContainer}
       </main>
     )
   }
 }
 
 
 class ProductCarousel extends React.Component {
   constructor(props){
   	super(props);
   	this.state = {
       showRightArrow:true,
       showLeftArrow:false
     };
     this.updateDimensions = this.updateDimensions.bind(this);
     this.animateProductCarousel = this.animateProductCarousel.bind(this);
   }
 
   componentWillMount() {
     window.addEventListener("resize", this.updateDimensions);
   }
 
   componentDidMount() {
     this.updateDimensions();
   }
 
   updateDimensions(){
     const containerWidth = $('#main-content').width();
-    console.log(containerWidth);
-    const sliderWidth = containerWidth * 3;
+    const sliderWidth = containerWidth * Math.ceil(this.props.products / 5);
     const itemWidth = containerWidth / 5;
     this.setState({
       sliderPosition:0,
       containerWidth:containerWidth,
       sliderWidth:sliderWidth,
       itemWidth:itemWidth
     });
   }
 
   animateProductCarousel(dir){
 
     let newSliderPosition = this.state.sliderPosition;
     if (dir === 'left'){
       newSliderPosition = this.state.sliderPosition - this.state.containerWidth;
     } else {
       newSliderPosition = this.state.sliderPosition + this.state.containerWidth;
     }
 
     this.setState({sliderPosition:newSliderPosition},function(){
 
       let showLeftArrow = true,
           showRightArrow = true;
       const endPoint = this.state.sliderWidth - this.state.containerWidth;
       if (this.state.sliderPosition <= 0){
         showLeftArrow = false;
       }
       if (this.state.sliderPosition >= endPoint){
         showRightArrow = false;
       }
 
       this.setState({
         showLeftArrow:showLeftArrow,
         showRightArrow:showRightArrow
       });
 
     });
 
   }
 
   render(){
 
     let carouselItemsDisplay;
     if (this.props.products && this.props.products.length > 0){
       carouselItemsDisplay = this.props.products.map((product,index) => (
         <ProductCarouselItem
           key={index}
           product={product}
           itemWidth={this.state.itemWidth}
           env={this.props.env}
         />
       ));
     }
 
     let rightArrowDisplay, leftArrowDisplay;
     if (this.state.showLeftArrow){
       leftArrowDisplay = (
         <div className="product-carousel-left">
           <a onClick={() => this.animateProductCarousel('left')} className="carousel-arrow arrow-left">
             <i className="material-icons">chevron_left</i>
           </a>
         </div>
       );
     }
     if (this.state.showRightArrow){
       rightArrowDisplay = (
         <div className="product-carousel-right">
           <a onClick={() => this.animateProductCarousel('right')} className="carousel-arrow arrow-right">
             <i className="material-icons">chevron_right</i>
           </a>
         </div>
       );
     }
 
     return (
       <div className="product-carousel">
         <div className="product-carousel-header">
           <h2><a href={this.props.link}>{this.props.title}<i className="material-icons">chevron_right</i></a></h2>
         </div>
         <div className="product-carousel-wrapper">
           {leftArrowDisplay}
           <div className="product-carousel-container">
             <div className="product-carousel-slider" style={{"width":this.state.sliderWidth,"left":"-"+this.state.sliderPosition + "px"}}>
               {carouselItemsDisplay}
             </div>
           </div>
           {rightArrowDisplay}
         </div>
       </div>
     )
   }
 }
 
 class ProductCarouselItem extends React.Component {
   constructor(props){
   	super(props);
   	this.state = {};
   }
 
   render(){
     let imageBaseUrl;
     if (this.props.env === 'live') {
       imageBaseUrl = 'cn.opendesktop.org';
     } else {
       imageBaseUrl = 'cn.pling.it';
     }
     return (
       <div className="product-carousel-item" style={{"width":this.props.itemWidth}}>
         <a href={"/p/"+this.props.product.project_id }>
           <figure>
             <img className="very-rounded-corners" src={'https://' + imageBaseUrl + '/cache/200x171/img/' + this.props.product.image_small} />
           </figure>
           <div className="product-info">
             <span className="product-info-title">{this.props.product.title}</span>
             <span className="product-info-user">{this.props.product.username}</span>
           </div>
         </a>
       </div>
     )
   }
 }
 
 
 
 ReactDOM.render(
     <App />,
     document.getElementById('main-content')
 );
diff --git a/httpdocs/theme/react/opendesktop-home.js b/httpdocs/theme/react/opendesktop-home.js
index 8bc1ccf7a..c01c48506 100644
--- a/httpdocs/theme/react/opendesktop-home.js
+++ b/httpdocs/theme/react/opendesktop-home.js
@@ -1,287 +1,286 @@
 class App extends React.Component {
   constructor(props) {
     super(props);
     this.state = {
       loading: true
     };
     this.initHomePage = this.initHomePage.bind(this);
     this.updateDimensions = this.updateDimensions.bind(this);
     this.convertDataObject = this.convertDataObject.bind(this);
   }
 
   componentWillMount() {
     this.updateDimensions();
   }
 
   componentWillUnmount() {
     window.removeEventListener("resize", this.updateDimensions);
     window.removeEventListener("orientationchange", this.updateDimensions);
   }
 
   componentDidMount() {
     this.initHomePage();
   }
 
   initHomePage() {
     window.addEventListener("resize", this.updateDimensions);
     window.addEventListener("orientationchange", this.updateDimensions);
 
     let env = "live";
     if (location.hostname.endsWith('cc')) {
       env = "test";
     } else if (location.hostname.endsWith('localhost')) {
       env = "test";
     }
     this.setState({ env: env }, function () {
       this.convertDataObject();
     });
   }
 
   updateDimensions() {
     const width = window.innerWidth;
     let device;
     if (width >= 910) {
       device = "large";
     } else if (width < 910 && width >= 610) {
       device = "mid";
     } else if (width < 610) {
       device = "tablet";
     }
     this.setState({ device: device });
   }
 
   convertDataObject() {
     let productGroupsArray = [];
     for (var i in window.data) {
       if (i !== "comments") {
         const productGroup = {
           title: i,
           products: JSON.parse(window.data[i])
         };
         productGroupsArray.push(productGroup);
       }
     }
     this.setState({ productGroupsArray: productGroupsArray, loading: false });
   }
 
   render() {
     let productCarouselsContainer;
     if (this.state.loading === false) {
       productCarouselsContainer = this.state.productGroupsArray.map((pgc, index) => React.createElement(
         "div",
         { key: index, className: "section" },
         React.createElement(
           "div",
           { className: "container" },
           React.createElement(ProductCarousel, {
             products: pgc.products,
             device: this.state.device,
             title: pgc.title,
             link: '/',
             env: this.state.env
           })
         )
       ));
     }
 
     return React.createElement(
       "main",
       { id: "opendesktop-homepage" },
       React.createElement(
         "div",
         { id: "featured-product" },
         React.createElement("div", { className: "container" })
       ),
       productCarouselsContainer
     );
   }
 }
 
 class ProductCarousel extends React.Component {
   constructor(props) {
     super(props);
     this.state = {
       showRightArrow: true,
       showLeftArrow: false
     };
     this.updateDimensions = this.updateDimensions.bind(this);
     this.animateProductCarousel = this.animateProductCarousel.bind(this);
   }
 
   componentWillMount() {
     window.addEventListener("resize", this.updateDimensions);
   }
 
   componentDidMount() {
     this.updateDimensions();
   }
 
   updateDimensions() {
     const containerWidth = $('#main-content').width();
-    console.log(containerWidth);
-    const sliderWidth = containerWidth * 3;
+    const sliderWidth = containerWidth * Math.ceil(this.props.products / 5);
     const itemWidth = containerWidth / 5;
     this.setState({
       sliderPosition: 0,
       containerWidth: containerWidth,
       sliderWidth: sliderWidth,
       itemWidth: itemWidth
     });
   }
 
   animateProductCarousel(dir) {
 
     let newSliderPosition = this.state.sliderPosition;
     if (dir === 'left') {
       newSliderPosition = this.state.sliderPosition - this.state.containerWidth;
     } else {
       newSliderPosition = this.state.sliderPosition + this.state.containerWidth;
     }
 
     this.setState({ sliderPosition: newSliderPosition }, function () {
 
       let showLeftArrow = true,
           showRightArrow = true;
       const endPoint = this.state.sliderWidth - this.state.containerWidth;
       if (this.state.sliderPosition <= 0) {
         showLeftArrow = false;
       }
       if (this.state.sliderPosition >= endPoint) {
         showRightArrow = false;
       }
 
       this.setState({
         showLeftArrow: showLeftArrow,
         showRightArrow: showRightArrow
       });
     });
   }
 
   render() {
 
     let carouselItemsDisplay;
     if (this.props.products && this.props.products.length > 0) {
       carouselItemsDisplay = this.props.products.map((product, index) => React.createElement(ProductCarouselItem, {
         key: index,
         product: product,
         itemWidth: this.state.itemWidth,
         env: this.props.env
       }));
     }
 
     let rightArrowDisplay, leftArrowDisplay;
     if (this.state.showLeftArrow) {
       leftArrowDisplay = React.createElement(
         "div",
         { className: "product-carousel-left" },
         React.createElement(
           "a",
           { onClick: () => this.animateProductCarousel('left'), className: "carousel-arrow arrow-left" },
           React.createElement(
             "i",
             { className: "material-icons" },
             "chevron_left"
           )
         )
       );
     }
     if (this.state.showRightArrow) {
       rightArrowDisplay = React.createElement(
         "div",
         { className: "product-carousel-right" },
         React.createElement(
           "a",
           { onClick: () => this.animateProductCarousel('right'), className: "carousel-arrow arrow-right" },
           React.createElement(
             "i",
             { className: "material-icons" },
             "chevron_right"
           )
         )
       );
     }
 
     return React.createElement(
       "div",
       { className: "product-carousel" },
       React.createElement(
         "div",
         { className: "product-carousel-header" },
         React.createElement(
           "h2",
           null,
           React.createElement(
             "a",
             { href: this.props.link },
             this.props.title,
             React.createElement(
               "i",
               { className: "material-icons" },
               "chevron_right"
             )
           )
         )
       ),
       React.createElement(
         "div",
         { className: "product-carousel-wrapper" },
         leftArrowDisplay,
         React.createElement(
           "div",
           { className: "product-carousel-container" },
           React.createElement(
             "div",
             { className: "product-carousel-slider", style: { "width": this.state.sliderWidth, "left": "-" + this.state.sliderPosition + "px" } },
             carouselItemsDisplay
           )
         ),
         rightArrowDisplay
       )
     );
   }
 }
 
 class ProductCarouselItem extends React.Component {
   constructor(props) {
     super(props);
     this.state = {};
   }
 
   render() {
     let imageBaseUrl;
     if (this.props.env === 'live') {
       imageBaseUrl = 'cn.opendesktop.org';
     } else {
       imageBaseUrl = 'cn.pling.it';
     }
     return React.createElement(
       "div",
       { className: "product-carousel-item", style: { "width": this.props.itemWidth } },
       React.createElement(
         "a",
         { href: "/p/" + this.props.product.project_id },
         React.createElement(
           "figure",
           null,
           React.createElement("img", { className: "very-rounded-corners", src: 'https://' + imageBaseUrl + '/cache/200x171/img/' + this.props.product.image_small })
         ),
         React.createElement(
           "div",
           { className: "product-info" },
           React.createElement(
             "span",
             { className: "product-info-title" },
             this.props.product.title
           ),
           React.createElement(
             "span",
             { className: "product-info-user" },
             this.props.product.username
           )
         )
       )
     );
   }
 }
 
 ReactDOM.render(React.createElement(App, null), document.getElementById('main-content'));