more improvements and work on the new website version