Rearranging headers and moving letter display implementation to a separate file