Making Site look better, almost done