layout fix and placed into the right place