Styling and module improvements