Improved layout organization + more/less now threadsafe