Bring back layouts for buttons, change JLayoutFile to use /layout folder