fixed some stuff and switced from static to dynamic content