layout simpify
layout fix