Fixed layout bug