Another layout bug fixed