removed crappy layout