remove viewport
Merge branch 'tranlog' into testing
add bottom margin
Merge branch 'tranlog' into testing