diff --git a/src/main/java/at/windesign/application/movie/movieDetailsForwardComposer.java b/src/main/java/at/windesign/application/movie/movieDetailsForwardComposer.java
index f2d29c8..1b7758c 100644
--- a/src/main/java/at/windesign/application/movie/movieDetailsForwardComposer.java
+++ b/src/main/java/at/windesign/application/movie/movieDetailsForwardComposer.java
@@ -9,6 +9,8 @@ import org.zkoss.zul.*;
 import java.net.URL;
 import java.sql.ResultSet;
 import java.sql.Statement;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.TreeMap;
 
 public class movieDetailsForwardComposer extends GenericForwardComposer<Component>
@@ -20,12 +22,42 @@ public class movieDetailsForwardComposer extends GenericForwardComposer<Componen
 	@Wire
 	private Window detailsMovie;
 
+	@Wire
+	protected Groupbox castBox;
+
+	@Wire
+	protected Groupbox crewBox;
+
+	@Wire
+	protected Groupbox genreBox;
+
+	@Wire
+	protected Groupbox productionCompaniesBox;
+
+	@Wire
+	protected Groupbox productionCountriesBox;
+
 	@Wire
 	protected Groupbox overview;
 
 	@Wire
 	protected Label overviewLabel;
 
+	@Wire
+	protected Listbox castList;
+
+	@Wire
+	protected Listbox crewList;
+
+	@Wire
+	protected Listbox genreList;
+
+	@Wire
+	protected Listbox productionCompaniesList;
+
+	@Wire
+	protected Listbox productionCountriesList;
+
 	@Wire
 	protected Groupbox settings;
 
@@ -65,6 +97,11 @@ public class movieDetailsForwardComposer extends GenericForwardComposer<Componen
 		super.doAfterCompose(comp);
 
 		overview.setStyle("opacity: " + opacity + "%");
+		castBox.setStyle("opacity: " + opacity + "%");
+		crewBox.setStyle("opacity: " + opacity + "%");
+		genreBox.setStyle("opacity: " + opacity + "%");
+		productionCompaniesBox.setStyle("opacity: " + opacity + "%");
+		productionCountriesBox.setStyle("opacity: " + opacity + "%");
 		settings.setStyle("opacity: " + opacity + "%");
 
 		int hD = (int) self.getDesktop().getAttribute("desktopHeight");
@@ -123,10 +160,103 @@ public class movieDetailsForwardComposer extends GenericForwardComposer<Componen
 			resolution.appendItem(rs.getString("resolution"));
 		}
 
-		detailsMovie.setTitle(m_movie.getMovieTitle() + " (" + m_movie.getReleaseDate() + ")");
+		String title = m_movie.getMovieTitle() + " (" + m_movie.getReleaseDate() + ")";
+
+		if(!m_movie.getOriginalTitle().isEmpty())
+		{
+			title = title + " [" + m_movie.getOriginalTitle() + "]";
+		}
+
+		detailsMovie.setTitle(title);
 		overviewLabel.setValue(m_movie.getOverview());
+
+		for(String cast : m_movie.getCast().split("\\|"))
+		{
+			if(cast.isEmpty())
+				continue;
+
+			String   name     = cast.substring(0, cast.indexOf(","));
+			String   role     = cast.substring(cast.indexOf(",") + 1);
+			Listitem item     = new Listitem();
+			Listcell nameCell = new Listcell();
+			Listcell roleCell = new Listcell();
+
+			nameCell.setLabel(name);
+			roleCell.setLabel(role);
+
+			item.appendChild(nameCell);
+			item.appendChild(roleCell);
+
+			castList.appendChild(item);
+		}
+
+		for(String crew : m_movie.getCrew().split("\\|"))
+		{
+			if(crew.isEmpty())
+				continue;
+
+			String   name     = crew.substring(0, crew.indexOf(","));
+			String   job      = crew.substring(crew.indexOf(",") + 1);
+			Listitem item     = new Listitem();
+			Listcell nameCell = new Listcell();
+			Listcell jobCell  = new Listcell();
+
+			nameCell.setLabel(name);
+			jobCell.setLabel(job);
+
+			item.appendChild(nameCell);
+			item.appendChild(jobCell);
+
+			crewList.appendChild(item);
+		}
+
+		for(String genre : m_movie.getGenre().split(","))
+		{
+			if(genre.isEmpty())
+				continue;
+
+			Listitem item     = new Listitem();
+			Listcell genreCell = new Listcell();
+
+			genreCell.setLabel(genre);
+
+			item.appendChild(genreCell);
+
+			genreList.appendChild(item);
+		}
+
+		for(String productionCompany : m_movie.getProductionCompanies().split(","))
+		{
+			if(productionCompany.isEmpty())
+				continue;
+
+			Listitem item     = new Listitem();
+			Listcell productionCompanyCell = new Listcell();
+
+			productionCompanyCell.setLabel(productionCompany);
+
+			item.appendChild(productionCompanyCell);
+
+			productionCompaniesList.appendChild(item);
+		}
+
+		for(String productionCountry : m_movie.getProductionCountries().split(","))
+		{
+			if(productionCountry.isEmpty())
+				continue;
+
+			Listitem item     = new Listitem();
+			Listcell productionCountryCell = new Listcell();
+
+			productionCountryCell.setLabel(productionCountry);
+
+			item.appendChild(productionCountryCell);
+
+			productionCountriesList.appendChild(item);
+		}
+
 		localPath.setValue(m_movie.getLocalPath());
 		resolution.setValue(m_movie.getResolution());
-		progress.setSelectedIndex(m_movie.getState()-1);
+		progress.setSelectedIndex(m_movie.getState() - 1);
 	}
 }
diff --git a/src/main/java/at/windesign/application/movie/movieUpdateSelectorComposer.java b/src/main/java/at/windesign/application/movie/movieUpdateSelectorComposer.java
index 12aa2e0..83870d3 100644
--- a/src/main/java/at/windesign/application/movie/movieUpdateSelectorComposer.java
+++ b/src/main/java/at/windesign/application/movie/movieUpdateSelectorComposer.java
@@ -148,8 +148,6 @@ public class movieUpdateSelectorComposer extends SelectorComposer<Component>
 				updateMovie(data);
 
 				current++;
-
-				break;
 			}
 			isFinish = true;
 		}
diff --git a/src/main/java/at/windesign/application/serie/serieDetailsForwardComposer.java b/src/main/java/at/windesign/application/serie/serieDetailsForwardComposer.java
index 49eb412..6cbc93c 100644
--- a/src/main/java/at/windesign/application/serie/serieDetailsForwardComposer.java
+++ b/src/main/java/at/windesign/application/serie/serieDetailsForwardComposer.java
@@ -27,12 +27,42 @@ public class serieDetailsForwardComposer extends GenericForwardComposer<Componen
 	@Wire
 	private Window detailsSerie;
 
+	@Wire
+	protected Groupbox castBox;
+
+	@Wire
+	protected Groupbox crewBox;
+
+	@Wire
+	protected Groupbox genreBox;
+
+	@Wire
+	protected Groupbox productionCompaniesBox;
+
+	@Wire
+	protected Groupbox productionCountriesBox;
+
 	@Wire
 	protected Groupbox overview;
 
 	@Wire
 	protected Label overviewLabel;
 
+	@Wire
+	protected Listbox castList;
+
+	@Wire
+	protected Listbox crewList;
+
+	@Wire
+	protected Listbox genreList;
+
+	@Wire
+	protected Listbox productionCompaniesList;
+
+	@Wire
+	protected Listbox productionCountriesList;
+
 	@Wire
 	protected Groupbox settings;
 
@@ -75,6 +105,11 @@ public class serieDetailsForwardComposer extends GenericForwardComposer<Componen
 		super.doAfterCompose(comp);
 
 		overview.setStyle("opacity: " + opacity + "%");
+		castBox.setStyle("opacity: " + opacity + "%");
+		crewBox.setStyle("opacity: " + opacity + "%");
+		genreBox.setStyle("opacity: " + opacity + "%");
+		productionCompaniesBox.setStyle("opacity: " + opacity + "%");
+		productionCountriesBox.setStyle("opacity: " + opacity + "%");
 		settings.setStyle("opacity: " + opacity + "%");
 
 		int hD = (int) self.getDesktop().getAttribute("desktopHeight");
@@ -135,6 +170,92 @@ public class serieDetailsForwardComposer extends GenericForwardComposer<Componen
 
 		detailsSerie.setTitle(m_serie.getSeriesName() + " (" + m_serie.getSeriesFirstAired() + ")");
 		overviewLabel.setValue(m_serie.getSeriesOverview());
+
+		for(String cast : m_serie.getSeriesCast().split("\\|"))
+		{
+			if(cast.isEmpty())
+				continue;
+
+			String   name     = cast.substring(0, cast.indexOf(","));
+			String   role     = cast.substring(cast.indexOf(",") + 1);
+			Listitem item     = new Listitem();
+			Listcell nameCell = new Listcell();
+			Listcell roleCell = new Listcell();
+
+			nameCell.setLabel(name);
+			roleCell.setLabel(role);
+
+			item.appendChild(nameCell);
+			item.appendChild(roleCell);
+
+			castList.appendChild(item);
+		}
+
+		for(String crew : m_serie.getSeriesCrew().split("\\|"))
+		{
+			if(crew.isEmpty())
+				continue;
+
+			String   name     = crew.substring(0, crew.indexOf(","));
+			String   job      = crew.substring(crew.indexOf(",") + 1);
+			Listitem item     = new Listitem();
+			Listcell nameCell = new Listcell();
+			Listcell jobCell  = new Listcell();
+
+			nameCell.setLabel(name);
+			jobCell.setLabel(job);
+
+			item.appendChild(nameCell);
+			item.appendChild(jobCell);
+
+			crewList.appendChild(item);
+		}
+
+		for(String genre : m_serie.getSeriesGenre().split(","))
+		{
+			if(genre.isEmpty())
+				continue;
+
+			Listitem item     = new Listitem();
+			Listcell genreCell = new Listcell();
+
+			genreCell.setLabel(genre);
+
+			item.appendChild(genreCell);
+
+			genreList.appendChild(item);
+		}
+
+		for(String productionCompany : m_serie.getSeriesProductionCompanies().split(","))
+		{
+			if(productionCompany.isEmpty())
+				continue;
+
+			Listitem item     = new Listitem();
+			Listcell productionCompanyCell = new Listcell();
+
+			productionCompanyCell.setLabel(productionCompany);
+
+			item.appendChild(productionCompanyCell);
+
+			productionCompaniesList.appendChild(item);
+		}
+
+		for(String productionCountry : m_serie.getSeriesOriginCountries().split(","))
+		{
+			if(productionCountry.isEmpty())
+				continue;
+
+			Listitem item     = new Listitem();
+			Listcell productionCountryCell = new Listcell();
+
+			productionCountryCell.setLabel(productionCountry);
+
+			item.appendChild(productionCountryCell);
+
+			productionCountriesList.appendChild(item);
+		}
+
 		downloadLink.setValue(m_serie.getSeriesDownload());
 		localPath.setValue(m_serie.getSeriesLocalPath());
 		resolution.setValue(m_serie.getSeriesResolution());
diff --git a/src/main/java/at/windesign/application/serie/serieUpdateSelectorComposer.java b/src/main/java/at/windesign/application/serie/serieUpdateSelectorComposer.java
index ef399f0..04f16e1 100644
--- a/src/main/java/at/windesign/application/serie/serieUpdateSelectorComposer.java
+++ b/src/main/java/at/windesign/application/serie/serieUpdateSelectorComposer.java
@@ -170,7 +170,6 @@ public class serieUpdateSelectorComposer extends SelectorComposer<Component>
 
 					current++;
 				}
-				break;
 			}
 			isFinish = true;
 		}
diff --git a/src/main/webapp/movie/detailsMovie.zul b/src/main/webapp/movie/detailsMovie.zul
index bd2712d..231045f 100644
--- a/src/main/webapp/movie/detailsMovie.zul
+++ b/src/main/webapp/movie/detailsMovie.zul
@@ -23,6 +23,66 @@
                value=""/>
     </groupbox>
 
+    <hbox>
+        <groupbox id="castBox"
+        >
+            <caption>Cast</caption>
+            <listbox id="castList"
+                     height="200px"
+            >
+                <listhead>
+                    <listheader label="Name"/>
+                    <listheader label="Role"/>
+                </listhead>
+            </listbox>
+        </groupbox>
+        <groupbox id="crewBox"
+        >
+            <caption>Crew</caption>
+            <listbox id="crewList"
+                     height="200px"
+            >
+                <listhead>
+                    <listheader label="Name"/>
+                    <listheader label="Job"/>
+                </listhead>
+            </listbox>
+        </groupbox>
+        <groupbox id="genreBox"
+        >
+            <caption>Genre</caption>
+            <listbox id="genreList"
+                     height="200px"
+            >
+                <listhead>
+                    <listheader label="Genre"/>
+                </listhead>
+            </listbox>
+        </groupbox>
+        <groupbox id="productionCompaniesBox"
+        >
+            <caption>Production Companies</caption>
+            <listbox id="productionCompaniesList"
+                     height="200px"
+            >
+                <listhead>
+                    <listheader label="Production Company"/>
+                </listhead>
+            </listbox>
+        </groupbox>
+        <groupbox id="productionCountriesBox"
+        >
+            <caption>Production Companies</caption>
+            <listbox id="productionCountriesList"
+                     height="200px"
+            >
+                <listhead>
+                    <listheader label="Production Country"/>
+                </listhead>
+            </listbox>
+        </groupbox>
+    </hbox>
+
     <groupbox id="settings"
     >
         <caption>Settings</caption>
diff --git a/src/main/webapp/serie/detailsSerie.zul b/src/main/webapp/serie/detailsSerie.zul
index ec0ab3a..520510b 100644
--- a/src/main/webapp/serie/detailsSerie.zul
+++ b/src/main/webapp/serie/detailsSerie.zul
@@ -23,6 +23,66 @@
 			   value=""/>
 	</groupbox>
 
+	<hbox>
+		<groupbox id="castBox"
+		>
+			<caption>Cast</caption>
+			<listbox id="castList"
+					 height="200px"
+			>
+				<listhead>
+					<listheader label="Name"/>
+					<listheader label="Role"/>
+				</listhead>
+			</listbox>
+		</groupbox>
+		<groupbox id="crewBox"
+		>
+			<caption>Crew</caption>
+			<listbox id="crewList"
+					 height="200px"
+			>
+				<listhead>
+					<listheader label="Name"/>
+					<listheader label="Job"/>
+				</listhead>
+			</listbox>
+		</groupbox>
+		<groupbox id="genreBox"
+		>
+			<caption>Genre</caption>
+			<listbox id="genreList"
+					 height="200px"
+			>
+				<listhead>
+					<listheader label="Genre"/>
+				</listhead>
+			</listbox>
+		</groupbox>
+		<groupbox id="productionCompaniesBox"
+		>
+			<caption>Production Companies</caption>
+			<listbox id="productionCompaniesList"
+					 height="200px"
+			>
+				<listhead>
+					<listheader label="Production Company"/>
+				</listhead>
+			</listbox>
+		</groupbox>
+		<groupbox id="productionCountriesBox"
+		>
+			<caption>Production Companies</caption>
+			<listbox id="productionCountriesList"
+					 height="200px"
+			>
+				<listhead>
+					<listheader label="Production Country"/>
+				</listhead>
+			</listbox>
+		</groupbox>
+	</hbox>
+
 	<groupbox id="settings"
 	>
 		<caption>Settings</caption>