Issue #131 - adding session id verification
Issue #131 - rename layout label and remove hardcoded link