layout/component bug fixes