annotated models and fixed home page