final working layout commit