Improve password protection layout