Solved layout issue