New buttons. Main screen adjusted. Cleaned up code from the old buttons.