Modified term, fixed some layout stuffs.