Various bug fixes and re-organization

Added APC, changed PageData location, Dashboard updated, various bug
fixes