added album form + fixes