Fixa layoutbuggar
Merge buggfix