Improved some markup and styles