Mayor code layour improvements