Change layout and Add font
Fix conlifcts