Update

Change available layouts and redefine tags