Add formatting and mobile opti