refactored and remained several parts, progressed on the website