functionality integrated to theme. Need to fix layout