Improves Map & Buttons...