Redesigned code structure + little improvements to a few pages