Added modules and style adjustments