Fix layoutproblems -part 2 and final!