General Layout

Signed-off-by: LumleyA <alex.lumley@ntlworld.com>