Fixing the formatting and adding some styles