Added partial views, fixed some layouts