Styling and registration fixes