Add layout and authentication (by KB & RP)