Fixed build and small styling