Changed layout
Fixed layout bug