Adjusted the layout & key replacement