layout changes, todo for encryption