aide/eclipse consistency and some layout action