layout bug fixing