Tweak layout
Tweak layout & Fix wrong ellipsizes