Clean up of layout and injection of license