Cleaned up some stuff from previous designs. Fixed some URL issues