Cleaned up APIs working on layout