added _includes and clean up

buttons, icons and tables are .phps and includes.htmls.

cleaned up some formatting