samp integration, layout module, bugfixes