updated layout and remove follow