Refactor Templates and CSS for layout tweak