Swing menu refactoring. Better defined grid constraints