Ver. 3

alter some layout