layout mess fixed