Change licencing to prevent future problems
Layout improvements