Cleaned up API. Also added some new types to better encapsulate logic
and layout information.