fixed
pretty major layout overhaul