Updated the whole style and structure