Added 'Back' button
Fixed bugs with factories