commiting minor changes in models and view structure