Answer layout revamped

AnswerLayout_Revamped is an improvement to the AnswerLayout, these should be the same branch.