mixing the web site with the framework. Some changes and new features (bugs) was created.