fixing layout flaws