Added initial styling support