Added modules and refined first version styles