Added button, hat, clean up