Changed visuals and some markup, Pull these changes