code clean up & cant remember

a more uniformed naming convention for screens and elements of screens
mostly done. mate button & payscreen work as intended.