Refactor
Authentication credentials layout