Added functionality and changed layout