Reverted change and updated layout