Changed style and some packages