Fixes - Layout changes and added friction
[#74049456]