Updated to dynamic
Update app layout