layout bug fix + code clean