fix and perfect layout