Added some style and structure