Code refactor.
Added some layout enhancement.