Separate captcha layout into own file

Change-Id: I3d2bdef1f722eacea4e350bd4c5463fb1d28cbe4
Merge "Separate captcha layout into own file"