Rewritten deployment test procedure
Generic layout improvements