new layout + fixes