cleaned up a few more lines of code and made links buttons.