bug/layout fix