added layout + fancy dynamic stuff