Added header and buttons
Added a factory (unused)