updated layout, added choice of cipher