layout and API update (Suggested by follower)