hackish layout improvement