Added end level structure, and improved layering