Refactor configuration and fix styles