Added JavaScript section + some minor changes and restructurisations