Added compnents like messages, buttons and more...