Refactor styles, WIP on the panel module