made layouts less crappy