modified Panel sizes
merged conflicts