Solved layout bug