Yekkanti - Really reverted the disable/enable photo wall button code and fixed some tests which were failing