Fixed Javascript issues caused by merge; got rid of r:layoutResources that was causing tabs to not work.