Temporary styling and merging code