Fixes the layout bug