hackish layout improvement - rework