Update pc code & styles
Update build configuration