Changed parameter names to be more consistent.
Started implementing containers and layouts.