layout cleanup
logic change